Incomplete commit due to conflicts