Assroted modifications including gitmodules merge conflicts