merge
Tower, Enemy, Missilie
removed log from ignore