Removed conflicts in files