changes
conflicts and fixes