666 is added
after resolving conflict