fixed merge for real this time