Controller MErge Conflict