Fixed merge issues and added two shotguns