Fix usual merge, merge, merge, merge mess