Fixed conflicts and minor changes (2)