forcing conflicts
Fixed merging conflicts