added auto merge feature