Fixed some mergeconflicts