Improved reasons a bit, removed conflict markers