local change conflict with server
commit again after merge