Merge aftermath solved.
trying to deal with merge aftermath.