resolve merge conflicts, effectively reverting "verbose" setting