Done fixing merging conflicts