cleaning up after merge mess.