[LCD4Linux] fix some conflicts.