merged + my last commit non-received commit