Updated composer for dev
Fixed Merge