setting up for merge conflict testing
merging while ignoring conflicts
fixed failing check for merging into dev
merged
testing full run