Minor change, did not resolve conflict properly