merge conflict attribute generator