it's asking me to commit stuff but i don't think i changed anything
committing for conflicts.