Bug fixes
Fixed conflict