delete merge conflict message on packages file