Some minor changes
resolved conflicts