merging isnt really very easy, id suggest just e-mailing the map to each other and you working on the map 1 day, and your freind working on the map the next day or something like that
and on the plus side you would have plenty of backups in your e-mail
Most people use this strategy :thup: