some small cleanup
resolve merge conflict