Fix merge, remove warning