Minor changes
Fixed conflict