sd
added more info
resolving merge conflict