merging bug fixed for good