Fixed conflict file
Fixed file