added collission detection
resolved conflict