fixed commit authorship
concluding merge