minor changes
merge
resolve merge conflicts
minor changes