Fix merge issues?