Manual merge between last commits