Composer scripts updated
Conflicts merged