Got the merger working still having issues with static files