removed extra conflict file