small stuff
resolved conflicts