Merge commit
merged
Finally merged correctly. Collision still works bad