finally corrected merge