Merged and working