Forgot to merge a conflict