tweakin'
resolving conflict / few additions