Pa5 solved
conflict resolved