added new collission
merged conflicts
merged master