[Commit FIX]: Still struggling with git conflicts