+ conflict detection algorithm implemented (quite messy, needs cleanup)