Issue #5
Issue #1
conficts resolved
alignment