merge with HEAD, conflicts resolved