Change status to success on output, Bump version to 3.0
Fix merge conflict
Fix merge conflict