merge prep
Fixed game freezing upon pressing button