removed merge conflict files? i gues that's what this is.