changed something
resolved conflicts