add a dummy merge method
most merge steps done
hopefully fixed