Ready to Accept Frankie Conflicts
Commit Settings
Attempt to Pull2
Merge remote-tracking branch 'origin/master' into master1
Post Merge with Frankie
Post Merge with Frankie