Merge still not working!