Hand merge after serverity