first commit
removed cache
resolved conflicts