makes minor updates
merges conflicts