Pre commit merge