got rid of binding
getting merge conflicts