pushing my stuff added quote
fixed merge conflicts