issue fixed draft
conflict resolved
issue fixed draft page