Fix merge messup