attempting to merge with local branch
hopefully fixed merge