Fix annoying warning
Fix error that I suppose are merge error