Now the preferences panel are working (still a lot of things to be done)
Fix merge problems