removed git confict text in files {@,@}