parse external declarations
fix merge conflicts