If you have problems with merge - use gda - it make rgn firmware as result.