Fixed merge conflict problems
Fixed merge conflict problems

mrvisser/Hilary,timdegroote/Hilary,jfederico/Hilary,jfederico/Hilary,simong/Hilary,stuartf/Hilary,Orodan/Hilary,Orodan/Hilary,timdegroote/Hilary,ExC0d3/Hilary,stuartf/Hilary,nicolaasmatthijs/Hilary,mrvisser/Hilary,nicolaasmatthijs/Hilary,Coenego/Hilary,simong/Hilary,ExC0d3/Hilary