Merge dev and main branches