Merge and devops stuff