fixed warning and merge proposal