Updated code and removed buggy merger