midway commit
merge conflicts resolved
question render bugs complete
Merge remote-tracking branch 'origin/master'