fixed some merging problems and weird stuff