Resolved error from rebase and resolving file generation on Unix based systems.