Merge and diff development playgrount