hack-merge-master