Removed merging conflicts