Fixed some merging conflicts