fix fixing old merge