Checkout local changes conflict in api