last part of merge resolved