Cleaning that merge up a bit