Conflict file and branch removed