there are some strange files changed

still some merge errors