Works sligthly better, still merging everything