attempt to fix blank merges