Temporary PR

Showing progress of merge conflict correction...