Ignore the previous commit... merged with master