Commit reference in the wrong spot
Complete merge