Changes
Conflicts fixed