merge conflict resolution for index and css