manual merging of lartkma pull