layout fixes.
resolve conflict.