Fix error when merging last commit