Still fixing conflicts

Contact Module completed see history for detail.