Hopefully they work it out, but I'm sure it'll be at the last minute if they do. Things I would like to see changed:
1. Some type of effective rookie salary cap, similar to NBA perhaps.
2. Some sort of cap discount for your own drafted players. Perhaps, 90% of your own drafted player contract count against the cap, verses signing someone elses draft pick in free agency counting 110% against the cap.
In general some sort of method that doesn't restrict free agency, but gives the home team a little bit of an advantage in drafting well.
3. Major give to the players to get most of what the owner wants is a higher salary floor. Perhaps raise the current % slightly, but require a team to have a increasing higher floor. Allows a rebuilding team, but prevents a team for low balling salary year after year. Maybe even require every team to be within 10% of the ceiling one out of five years of the contract.