added merge feature
added features