Fixing a conflict
Updated conflicts