Fixed collision box and strange merging things