Fixed some stray merge conflicts