Attempt to ease merge