localhost code merge with alwasatt to continue work