Merge Conflict Studio - Developer