various commits
resolved conflicts