committing most recent local work
resolving merge conflicts