commit to pull
fixed merging errors
commit to pull
fixed pull issues, fixed an error with the buttons