Remove and fix merge yucks