final resolve of merge problem