Merge the RES and GUI branches.