fix all conflicts, no more error (hope so =.=)