Syncing the branches back to master