conflict fixes, Long.compare and component mover not working for all
members