no staging required -- resolving merge conflict