You have not concluded your merge git