Compromise reached on disputed Dallas hotel property