solved merge conflict by keeping flavios old version