Merging final alignment bug