add comment, ger rid of unneeded import
resolve merge