resolving merge conflicts/updating prompts
adding untracked files