Fixed Bug
Fixed conflict