merge on unison conflict
resynched current makefile
error check missing pose
push on current and clean