fixing merge conflicts with origin master