modified some answers
Fixed conflicts