added macaw
fixed merge conflicts
fixed conflict errors 2