post deprecation notices
resolve merge conflict