Merge the last commits