accidental deletion of .git because I named directories the same; mobile support
fixing conflicts + mobile support