Mapped branch names to be conssitent with github branches
Merge remote-tracking branch 'origin/master'