commit to pull
fixing conflict
add laser sound