change the side nag
conflict commit
 commit for merge