added new collission
merged conflicts