Final touch after merge