Merge Conflict trial