remove a stray file that should not be there
fix merge conflict