Merge Conflict change reset back in JavaPlayer