Merging bug fixed