commit from server after updating composer and stuffs
merge?