minor changes
conflicts solved