Merge in changes from GitHub, both gitlab and GitHub project have committed changes since migrating the project. This combines the changes from both projects and makes the gitlab repository the preferred repository (GitHub project will now be archived).