updating to comply with merge