resolved conflicts and merge with main library