Manually Merge Nico's changes in... Next time he will pull before he pushes and we can just merge using git, with any luck