Got netbeans to accept merge