corrected wrong merge