resolve conflicts

jwm/package_list/base_utilities

jwm/package_list/desktop

jwm/pacman.conf

jwm/rootfs/etc/obarun/install.conf

jwm/rootfs/etc/pacman.conf

jwm/rootfs/etc/skel/.config/jwm/theme

jwm/rootfs/etc/skel/.config/jwm/tray

jwm/rootfs/etc/skel/.config/terminator/config

jwm/rootfs/etc/skel/Desktop/README

minimal/package_list/base_utilities

minimal/pacman.conf

minimal/rootfs/etc/obarun/install.conf

minimal/rootfs/etc/pacman.conf

openbox/package_list/base_utilities

openbox/package_list/desktop

openbox/pacman.conf

openbox/rootfs/etc/obarun/install.conf

openbox/rootfs/etc/pacman.conf

openbox/rootfs/etc/skel/.config/openbox/menu.xml

openbox/rootfs/etc/skel/.config/terminator/config