fix derpy merge