Pulling with merge-conflict