Merged master fixed conflict.
Updated package script