added shane to list
Fixed conflict