session and submodule commits
removing session files from git repo
resolving merge