squash
merge master and resolve conflicts