commit before pull
resolve merge