3 spaces to 2
Updated conflict