Manual merge resolution now works and is tested