Fix derpy merge confict resolution