fix conflicts, bugs