Updated files for merge conflict resolution