Remove conflict markers
Remove conflict markers

sideci-sample/sideci-sample-refinerycms,aguzubiaga/refinerycms,refinery/refinerycms,stefanspicer/refinerycms,mlinfoot/refinerycms,anitagraham/refinerycms,Retimont/refinerycms,mkaplan9/refinerycms,KingLemuel/refinerycms,gwagener/refinerycms,chrise86/refinerycms,aguzubiaga/refinerycms,simi/refinerycms,refinery/refinerycms,hoopla-software/refinerycms,mkaplan9/refinerycms,chrise86/refinerycms,anitagraham/refinerycms,refinery/refinerycms,sideci-sample/sideci-sample-refinerycms,mkaplan9/refinerycms,johanb/refinerycms,mlinfoot/refinerycms,bricesanchez/refinerycms,kappiah/refinerycms,Eric-Guo/refinerycms,hoopla-software/refinerycms,KingLemuel/refinerycms,KingLemuel/refinerycms,Retimont/refinerycms,trevornez/refinerycms,kappiah/refinerycms,simi/refinerycms,stefanspicer/refinerycms,stefanspicer/refinerycms,mlinfoot/refinerycms,gwagener/refinerycms,LytayTOUCH/refinerycms,johanb/refinerycms,hoopla-software/refinerycms,kappiah/refinerycms,trevornez/refinerycms,aguzubiaga/refinerycms,Eric-Guo/refinerycms,chrise86/refinerycms,simi/refinerycms,LytayTOUCH/refinerycms,simi/refinerycms,LytayTOUCH/refinerycms,mabras/refinerycms,trevornez/refinerycms,Retimont/refinerycms,mabras/refinerycms,anitagraham/refinerycms,gwagener/refinerycms,Eric-Guo/refinerycms,bricesanchez/refinerycms,mabras/refinerycms,johanb/refinerycms