Removed references to inline as it's not related to merging