Some morge Merge Conflicts handmatic fixed.