Fix minor merge conflicts