stash commit
resolve conflicts
track new files in setup