Most of merge fixes done