plane prototipe
merge fix