initial work desktop setup
resolving merge conflicts