merge dev files