Added Comments
New Launch Files
resolving conflicts