Most of the merging conflicts and changes done in css