fixed color bug, fixed merge issues