returned to own merge and removed the stupid one