Fix conflicts
Fix conflicts

adeubank/Integrated,laracasts/Integrated,skynet/Integrated,whoacowboy/Integrated,JoeForks/Integrated,poznet/Integrated,oxyzero/Integrated,skynet/Integrated,Flambe/Integrated,adeubank/Integrated,poznet/Integrated,Sunnepah/Integrated,whoacowboy/Integrated,Flambe/Integrated,laracasts/Integrated,oxyzero/Integrated,JoeForks/Integrated,Sunnepah/Integrated