Removing the merge confilicts that I though Sameer removed, but maybe I screwed something up