Trailer with modal
fix conflicts