Merge conflict put function out of class... fixed