fix merge conflicts - silly SourceTree