Resolved the conflicts

Please pull master this time