merge workarounds