fix conflicts, errors, notices