Maybe show a error icon when merging failed
Maybe show a error icon when merging failed