fixing the left over merge in post