moditems stuff, git conflict