Fix merge issues with previous commit