merge changes
conflicts fixed