developing
Complete merge code