Only merge code that smells nice