check for respond_to !merge

check for respond_to !merge
resolve conflicts