Cleaned up ray template file
fixed merge conflict