Resolved Board App Conflicts (1455)

-resolved file conflicts under board app