added missing include file
fixed merge conflicts