another attempt to clean up superfluous merges