Merge is working; Added slop