Merge dev files