Tweak code
Solve conflict