[Commits] 3d1f323: Adjusted a wrong merge