add sound effects
merge code & handle conflicts