pre merge commit pt 2