Merge Conflict Cleanup