Merges dev