Fixed some merge issues. Need to fix warning sound at time 100