fix merging shit lol
fix wrong method call