some minor changes made
conflicts removed