fixed merged conflict in player