no edit on merges or pulls
removed conflicting option