Actually resolve conflict, remove conflict message

Done by Matt