Removing conflict file