removing conflict file