Some stuff prior to trying a branch
merge conflicts