Fixed conflicts - 2