Fixed conflicts - 2.