solve conflicts in header file