conflict file removed

conflict file removed