small stuff
resolve conflict