Fix empty varibles merges