Forgot to remove this when resolving conflicts?