Fixed error caused by conflict during last push, marker-marker collision implemented