next commit

window conflict resolved