Cleanup the merge mess (previous commit)