fixed merge conflicts, merged into rohan_input
merged rohan_input