no conflicts?? awesome..just merged new layout and cover to hide the fact that the site isn't done