Fixed merging conflicts