merge dev and try solve conflicts