changes without pulling first
merging github files with modified me2 files