Hook File Merge Error Fixed