"HEAD"=>{branch, master} and resolve conflicts