Fixed Merging conflicts