Merging the right way is hard
Hum...
Wront constants + some code cleanup