Add user bookieposts
Change the conflicted file