Fix commited merge conflicts